Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 6 Sep 2011 18:29:03 +0000 (11:29 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 6 Sep 2011 18:29:03 +0000 (11:29 -0700)
commit32c46115baa20158d63d95e507e15db26e511878
treea4be10df33a027140337b81bf8cd229133642d1f
parent700a31a2817e164ab00c2922b48c1f709d62aedc
parent838ccc818028d7f5aed3ef42ce246b43172d718f
Merge from trunk.